Several bug fixes that accidentally didn't make it into 1.2.2